Add removecodes to database template
Fix annotations

Add annotations to the database template; fix the annotation code