Completing code base + cleanup unused modules