Cleaning the code

removing unnecessating things