remove critic
add sources
fix sources