changed build settings + cleanup