removed option stuff