Removed unused/unfinished code