Fixed Build
Deleted unused lines
Updated headers
Added patch
This works?