Deleted old code / cleaned up