Removed unncessary cached files from git, replaced callbacks in main.cpp