Add Controller and cleaning old