Remove unused/redundant code