Removed all @deprecated. Closes #18

This should be all for @deprecated