Removed unwanted extras / unused code