Removed a few stupid code