Some small progress
Removed files no longer needed
Last commit until removing spring