Code cleanup for clean compile