Removed debugging buttons from context menu. also removed some
unneeded TODO:s