Removing unnecessary elements

Improve the function of the system by removing unnecessary elements: