Removed some external functions