Cleanup unused code

Small code cleanup