cleaned up code that had had build errors and now code builds successfully