Removed some things that caused compiler warnings