Cleanup and try to fix build

Signed-off-by: anerik <anerikgames@gmail.com>