Removed #63, #79 & #84