Fixed deprecation stuff and removed unnecessary println