Tidy up
Ensured filters/events are executing in the correct order
Removed deleted files