removed unneded stuff in main