delete and simplify unnecessary functionality