Removed handler class