Removed unwanted stuff to adhere to coding standards