removed unnecessary functions

Also disabled some warnings