Removed leftover stuff