Removed unneded stuff