Removed some leftover garbage