Remove extra files, annotate models
Revert "Some fixes to babies controller"

This reverts commit 27323e85237ea78fea262ebd793423adfa7c6838.
Revert changes undid in revert commit
Merge branch 'master' into timeline