Removed vestigial code & cleaned up comments/dangling snippets for the last push to get out alpha