Labels and types
Removed test/temporary files