Clean up: remove unused components