Cleanup of imports and adding specific dependencies for some spring deps