remove bulk of code