Removed the Account class, general cleanup