removed useless class & refactor pins