remove unused/necessary code