Unneccessary scraps moved to separate file