Revert "Added @Override annotations"

This reverts commit cf2cbe75a455eac311c7ef5c4768a47217f0eb7e.