Removed some unnessessary imports
Fixed some nullpointexception