Removed Unneeded stuff