remove even more warnings
ifdef/remove unused code