Misc: Fix build and remove not needed code