Removed old code, fixed style more warnings