Cleaned useless variables and reference to the components apel