removed a lot of source