More fixes to build system
Removing unused variable
Fixing merge problem