removed application.yml and cleaned up code from first attempt