Removed some duplicate functions/