Adding ability to remove events in the admin panel and cleaned up some code