Updated forms, removed unneccessary files, cleaned code