clean the code

Clean the code to remove the unwanted stuff for now.