Removed some extranous functions