[Overall] Removed pre-automoc stuff.