Removed extra function, moving everything to MapTools library