Removed parts extra code lines