Still working on removing Spring boot