Squashed commit of the following:

commit 2d605db8d8b0bf0eff6523b8b3e73ca44703f6b0
Author: JBaltika <jim@genuineinteractive.com>
Date:   Sun Dec 1 14:41:06 2013 -0500

    Clean up