Fixed require issues. Removed unneccessary dependencies.