Cleaned handler()

Reworked handler() to use macros for efficiency. Also deleted Dorian's
useless file.