Removed spring dependency