Cleaning up the code

Just a quick clean of unneeded code in the Core project