remove things not yet working