cleaned up files and reverting to using if not instead of UNLESS macro