Remove Dynamic in some places