Removed non-spring code