rename to selflex and cleanup