Cleaned some leftover code