Cleanup, Credit to the author of some classes