Removed some verbose unneeded functions