Remove magic number dependencies