Use simple constructor checks
Remove untracked files