Cleaned the code by removing unnecessary components