Remove un-used methods