Removed Spring dependency