Cleaned some unused api stuff away