Removed not required stuff