Tidying up the trunk

Side branches are removed from the main trunk
Tidying up the trunk