refactor, remove unecessary components