Smarter apply/remove for code :) all it needs to do is be based on CodeBase