Final touch to the project and cleaned up some non used code.
Merge details
merged
mentioned in commit cebb2db9