Remove unecessary parts in Main