updated header file with conditionals and removed unnecessary files