Removed some functions that might not that useful