Removed various redundant code snippets/files and fixed typos