Added accidental delete protection, removed duplicated methods.