Removed unused code / cleanup