Code and repo cleanup