Remove unneeded layouts; Source configs