removing some extra functions that are not yet fully baked