minor refactoring. took out clipboard defines for time being
refactoring