Fixing unused vars
Fixing unused vars
Removing o files