Clean-up: Remove uneeded classes (for now)