Cleaned up for spring security