* some functions were not used and have been removed * some parameters seemed to be useless and have been removed * code cleanup