Consolidated various scripts and performed general cleanup.