Removing Extra Functions