Removed commented out unnecessary mess