Debugging

Also removed unnecessary function from handlers