Checked implementation of findBy* methods for complexity.
Removed deprecated TODO.
Don't use alert directly anymore.