Removed some external modules and fixed basic syntax errors